boot: Use emergency.target, not emergency.service
authorAlex Kiernan <alex.kiernan@hivehome.com>
Sat, 30 Jun 2018 17:03:51 +0000 (17:03 +0000)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 3 Jul 2018 13:38:10 +0000 (13:38 +0000)
Follow systemd units in using emergency.target, not emergency.service
(which is the sole unit, by default, in emergency.target) so we can
easily reconfigure the units which are actived when entering
emergency mode.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Closes: #1665
Approved by: cgwalters

src/boot/ostree-prepare-root.service
src/boot/ostree-remount.service

index e0659d1029a45ce822897e36677f257caef17f72..52cf88633441adb592209574568550117595ea3c 100644 (file)
@@ -20,7 +20,7 @@ Description=OSTree Prepare OS/
 DefaultDependencies=no
 ConditionKernelCommandLine=ostree
 ConditionPathExists=/etc/initrd-release
-OnFailure=emergency.service
+OnFailure=emergency.target
 After=initrd-switch-root.target
 Before=initrd-switch-root.service
 Before=plymouth-switch-root.service
index 8439b4953e38dd52c981f965bfa39fb9aa7c29a1..68209f9629764373e7958fd3c12d66d77cf8b1c3 100644 (file)
@@ -19,7 +19,7 @@
 Description=OSTree Remount OS/ bind mounts
 DefaultDependencies=no
 ConditionKernelCommandLine=ostree
-OnFailure=emergency.service
+OnFailure=emergency.target
 Conflicts=umount.target
 After=-.mount
 After=systemd-remount-fs.service